From: Kenichi Handa <handa@m17n.org>
Date: Wed, 23 Feb 2011 07:33:29 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2669^2~13
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8f4311f567bd1e48a5ede11f69e7aa9c8c60a056;p=emacs.git

merge trunk
---

8f4311f567bd1e48a5ede11f69e7aa9c8c60a056